A multitude of portability and cleanliness fixes. Nothing "real".

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index ac420fc02054e728fce30e0352ea5fa54e98161a..5b586b4f9f1a4f91b6034e75086e93098bfe930a 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -67,29 +67,6 @@ data_read(void)
 
 }
 
-static void
-gpsutil_disp(waypoint *wpt)
-{
-#if 0
-       double lon,lat;
-       signed int ilon, ilat;
-       const char *icon_token = "0";
-       char tbuf[1024];
-       char *tp = tbuf;
-       time_t tm = wpt->creation_time;
-
-       lon = wpt->position.longitude.degrees;
-       lat = wpt->position.latitude.degrees;
-
-       fprintf(file_out, "%08.5f, %08.5f, %s\n",
-               lat,
-               lon,
-               wpt->description);
-
-#else
-//     garmin_write_waypoint(wpt);
-#endif
-}
 static void
 data_write(void)
 {

diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c
index c8682e68a1a948dc7c5c918ced4221b9461ff214..a9e5584b56d91773301c4cf06bcd87d041c3ea75 100644 (file)
--- a/gpsbabel/holux.c
+++ b/gpsbabel/holux.c
@@ -33,7 +33,6 @@ History:
 
 
 static FILE *file_in;
-static  unsigned char byWpoFile[GM100_WPO_FILE_SIZE];
 static         unsigned char *HxWFile;
 static  char fOutname[256];
 
@@ -93,7 +92,6 @@ static void data_read(void)
 {
        char name[9], desc[90];
        double lat,lon;
-       char icon[3] = {0};
        unsigned char *HxWpt;
        waypoint *wpt_tmp;
     int iCount;
@@ -153,10 +151,6 @@ static void data_read(void)
 static void gpsutil_disp(waypoint *wpt)
 {
        double lon,lat;
-       const char *icon_token = "0";
-       char tbuf[1024];
-       char *tp = tbuf;
-       time_t tm = wpt->creation_time;
     int iIndex;
     WPT *pWptHxTmp;
 

diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.c
index 6987726b92e8c0995515cbfee0618d05323c6936..9021dc3deeeb042fac14b9a37f87d0cf4a3915b6 100644 (file)
--- a/gpsbabel/jeeps/gpsapp.c
+++ b/gpsbabel/jeeps/gpsapp.c
@@ -23,6 +23,7 @@
 ********************************************************************/
 #include "gps.h"
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/gpsbabel/jeeps/gpsutil.c b/gpsbabel/jeeps/gpsutil.c
index 218e84ed7868280cbcd6e29ccd555aa1c4ff944d..662fdb42cefb0a75a3ce1c411f0c7652824ea602 100644 (file)
--- a/gpsbabel/jeeps/gpsutil.c
+++ b/gpsbabel/jeeps/gpsutil.c
@@ -22,7 +22,6 @@
 ** Boston, MA  02111-1307, USA.
 ********************************************************************/
 #include "gps.h"
-// #include <termios.h>
 #include <fcntl.h>
 
 static int32 gps_endian_called=0;

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index dec7a1fcf0b5f9cd051f67ecfd77194c32f274c1..39da81c9956e39944412e105ac97acf1d9e4f2d0 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -191,16 +191,6 @@ struct hdr{
        waypoint *wpt;
 };
 
-static
-int 
-compare(const void *a, const void *b)
-{
-       const struct hdr *wa = a;
-       const struct hdr *wb = b;
-
-       return strcmp(wa->wpt->shortname, wb->wpt->shortname);
-}
-
 static void
 data_write(void)
 {

diff --git a/gpsbabel/mingw/libexpat.dll b/gpsbabel/mingw/libexpat.dll
new file mode 100644 (file)
index 0000000..e9a766c
Binary files /dev/null and b/gpsbabel/mingw/libexpat.dll differ

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index a048ca8525a6c8093bf5142d04a282e641cb2742..4ca5c499e90267daca30cb685680b7e8fd62f634 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -2,6 +2,8 @@
 #include <ctype.h>
 #include <stdlib.h>
 
+#include "defs.h"
+
 static const char vowels[] = "aeiouAEIOU";
 
 #define DEFAULT_TARGET_LEN 8
@@ -85,7 +87,7 @@ setshort_mustupper(int i)
 }
 
 char *
-mkshort(char *istring)
+mkshort(const char *istring)
 {
        char *ostring = strdup(istring);
        char *nstring;